From: Greg Kroah-Hartman Date: Sat, 6 Dec 2014 16:17:24 +0000 (-0800) Subject: Merge 3.18-rc7 into tty-next X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~5381^2 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=dd63af108f0814f0b589659f4e55a7a5af3b7e53;p=linux-4.9.git Merge 3.18-rc7 into tty-next This resolves the merge issue with drivers/tty/serial/of_serial.c Signed-off-by: Greg Kroah-Hartman --- dd63af108f0814f0b589659f4e55a7a5af3b7e53